hadrian-unreg-template-haskell

commit 702f7964373d9ffb1d550ee714bd723d8bb0c1a3
Author: Matthew Pickering <matthewtpickering@gmail.com>
Date:   Mon Apr 29 12:13:00 2024 +0100

    Make interface files and object files depend on inplace .conf file

    A potential fix for #24737

Gbp-Pq: Name hadrian-unreg-template-haskell

diff --git a/hadrian/src/Rules/Compile.hs b/hadrian/src/Rules/Compile.hs
index 473d2cf76ef4bf5fceea092df2377f8e67b8bad4..d8ca9ab40634b887b7de684d168c2a977820959f 100644 (file)
--- a/hadrian/src/Rules/Compile.hs
+++ b/hadrian/src/Rules/Compile.hs
@@ -218,6 +218,9 @@ compileHsObjectAndHi rs objpath = do
   ctxPath <- contextPath ctx
   (src, deps) <- lookupDependencies (ctxPath -/- ".dependencies") objpath
   need (src:deps)
+  -- The .conf file is needed when template-haskell is implicitly added as a dependency
+  -- when a module in the template-haskell package is compiled. (See #24737)
+  when  (isLibrary (C.package ctx)) (need . (:[]) =<< pkgConfFile ctx)
 
   -- The .dependencies file lists indicating inputs. ghc will
   -- generally read more *.hi and *.hi-boot files (direct inputs).